updated to accommodate detailed control panel